diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php
index 0a6a2af..93ec8b3 100644
--- a/system/libraries/Form_validation.php
+++ b/system/libraries/Form_validation.php
@@ -55,6 +55,9 @@
 	{
 		$this->CI =& get_instance();
 
+		// applies delimiters set in config file.
+		$this->_config_delimiters();
+		
 		// Validation rules can be stored in a config file.
 		$this->_config_rules = $rules;
 
@@ -69,6 +72,27 @@
 
 		log_message('debug', "Form Validation Class Initialized");
 	}
+	
+	// --------------------------------------------------------------------
+	
+	/**
+	 * if prefixes/suffixes set in config, assign and unset.
+	 * 
+	 * @return void
+	 */
+	private function _config_delimiters()
+	{
+		if (isset($rules['error_prefix']))
+		{
+			$this->_error_prefix = $rules['error_prefix']);
+			unset $rules['error_prefix']);
+		}
+		if (isset($rules['error_suffix']))
+		{
+			$this->_error_suffix = $rules['error_suffix']);
+			unset $rules['error_suffix']);
+		}
+	}
 
 	// --------------------------------------------------------------------
 
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index dc6b295..3aa9d65 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -72,6 +72,7 @@
    -  Minor speed optimizations and method & property visibility declarations in the Calendar Library.
    -  Removed SHA1 function in the :doc:`Encryption Library <libraries/encryption>`.
    -  Added $config['csrf_regeneration'] to the CSRF protection in the :doc:`Security library <libraries/security>`, which makes token regeneration optional.
+   -  Form Validation library now allows setting of error delimiters in the config file via $config['error_prefix'] and $config['error_suffix'].
 
 -  Core
 
diff --git a/user_guide_src/source/libraries/form_validation.rst b/user_guide_src/source/libraries/form_validation.rst
index e7875bc..1b3fa61 100644
--- a/user_guide_src/source/libraries/form_validation.rst
+++ b/user_guide_src/source/libraries/form_validation.rst
@@ -523,7 +523,7 @@
 
 By default, the Form Validation class adds a paragraph tag (<p>) around
 each error message shown. You can either change these delimiters
-globally or individually.
+globally, individually, or change the defaults in a config file.
 
 #. **Changing delimiters Globally**
    To globally change the error delimiters, in your controller function,
@@ -543,6 +543,12 @@
 
       <?php echo validation_errors('<div class="error">', '</div>'); ?>
 
+#. **Set delimiters in a config file**
+   You can add your error delimiters in application/config/form_validation.php as follows::
+   
+      $config['error_prefix'] = '<p class="error_prefix">';
+      $config['error_suffix'] = '<p class="error_suffix">';
+
 
 Showing Errors Individually
 ===========================